Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Develop into Main branch #166

Merged
merged 811 commits into from
Jan 11, 2024
Merged

Merge Develop into Main branch #166

merged 811 commits into from
Jan 11, 2024

Conversation

rajajawahar
Copy link
Contributor

No description provided.

androidmahi and others added 30 commits August 23, 2023 19:34
# Conflicts:
#	tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUITopBar.kt
#	tarkaui/src/main/java/com/tarkalabs/uicomponents/models/TarkaIcon.kt
…ahi/searchBar_in_TOpBar

# Conflicts:
#	tarkaui/src/main/java/com/tarkalabs/uicomponents/models/TarkaIcon.kt
# Conflicts:
#	tarkaui/src/main/java/com/tarkalabs/uicomponents/components/TUITopBar.kt
#	tarkaui/src/main/java/com/tarkalabs/uicomponents/models/TarkaIcon.kt
…nges

Added trailing in TUIAttachmentUpload
2) TUICardHeaderScreenShotTest + TUICardHeaderTest included.
3) default modifier Passed in TUIIconButton
…ndroid into nilesh/TUIAttachmentUpload-changes

# Conflicts:
#	example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt
…nges

Created Separate component TUIToggleRow
# Conflicts:
#	tarkaui/src/androidTest/java/com/tarkalabs/uicomponents/screenshots/TUIAttachmentUploadScreenShotTest.kt
# Conflicts:
#	example/src/main/java/com/tarkalabs/ui/UIComponentListActivity.kt
2) TUISelectionCardTags param values renamed properly.
TUISelectionCard component created with Tests + Screenshots Included.
@rajajawahar rajajawahar added the enhancement New feature or request label Jan 11, 2024
@rajajawahar rajajawahar self-assigned this Jan 11, 2024
@rajajawahar rajajawahar merged commit b31e066 into main Jan 11, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants